Small model and serializer change. Also, please now run scipts/clean.sh before committing, because having .pyc files in the repository is dumb