Lots of changes

added forms and things