dirtybit refactor + fixing up decorators