giant commit, flushed out broker class, revamped functions in all classes