Refactor no longer required. Tagging thingy done.