Revamp codebase to simplify functionality and add in aliasing of indexes (year through to second granularity) - not optional, will always alias.