further code-base work