Start adding faces
Updated model. Refactoring.
Fixed formatter