Fully tested and working

Tub 8