inital commit - work in progress