MISC changes, about to checkout tilson's repo