- Continuing updates and refactoring, work in progress