starting point for new direction, removed old factory and admin spec