Beginning restructuring for testing