Been doing a lot of work, probably should Commit

I think we are swimming towards the correct sea here