Fixed stuff - added boss - I should really do atomic commits