Have had some chance to work further on the new codebase. Progress is being made – I am currently cleaning things up in the user authentication code.