WIP. Code cleanup.  Added todo for Form support.