Testing alternate tokens
Started adding user editing and user views