Re-familiarising myself with this code-base