FInal commit - finished loose ends