Second commit - DOESN'T WORK!

Still in progress - authentication does not yet work.