all user stories working hooray
fix merged changes
update changes
fix merge
remove blank forms in wrong dir
updated errors with better errors, need to fix root path