Core refactor to suit changing needs.