Moved around imports to clean up the spec
Forms added to spec, adding to generation now
Updated spec to use the forms as well
Added in errors to spec
Removed unecessary file