puting some order in model and migrations, better tests for parser still needs improvement though