Feature/get enum types

Features on this branch finished, please review.
Why are these lines indented?