lots of edits, begun work on authentication