login works and prep to merge
Merging with Sassysquash