Refactoring and continuous progress WIP.