Lots of changes, added signup form