Fully tested and working

Few scuffs but nothing major