Competition Editor ready for initial merge with master