Last stretch

Last bit of functionality before submission