First bit of work to commit, sorta works