Initial Commit V2

I think I may have messed up on this one..