Initial commit
Modifications from MEAN