Version 2

Lots of changes and fixes, now supports reflective forms.