adding todo notes to domain to properly encapsulate private static members