Add some... commentary
Add the fancy enum stuff