removing cruft
adding structure for authentication