Final Week Commit 1

Features included: Sloppy play rectified