#17 Fixing @sheldond's issues and authentication