Not sure where i left of with this...lots of unstaged stuff
Commit