implemented login + added more deferred features