Refactoring done to a large extent. State of work before starting work on island expansion