Changed db model structure and added validator
Cleaned up some git stuff