Test Fit

A few more minor things to add, but mostly done!