Added new attributes, switched to enums, in the middle of cleaning things up.