11 Commit
Finish some validation
Need to fix controller though