Worked on the OmniTool a lot.
Pushed so somebody else can look at this dumb bug.