Playing with validation and field types. Expect lots of cleanups big changes soon.