Switched structure type to MultipleChoiceField based on types in db
Slightly more comments, re-arranged slightly