Continued work on the code refactor + interface updates