Initial Commit. Includes early draft of lazy date logic