Initial Commit V3

We fixed and screwed up things :D