Start on refactoring due to session scoped stuff requiring serializability