Data model rewrite
Check out previous commit of data.py, ORM design idea had issues