Code rearrange
Makign a right hash of things
Further work
Updated git ignore