Initial commit
Merged original branches together