Fix and refactor some stuff
Fix the rest of the forms and models
Update (not add) South migrations