Refactoring and bypass link

put the bypass link back in because I can't register yet :p
Setting up for CRUD refactoring