Add enum values

Start doing complex stuff