Fixed the field type conditional.
Make sure we always have a `self`
Munge method names properly.
Build more.