Updated models / Db connection, switched login to models