Final complex refactoring/redevelopment.