Cleanup, slowly adding authentication support