major project over haul, ready for testing