asdf
Merge origin/Michelle into Jack
asdf
serializing stuff
things
things
penaltys implemented and stuff
stuff
dfg