dirtybit refactor + fixing up decorators
restored files that got deleted
hugo