Initial skeleton of move to proper logic/auth functions