cleanup bunch of code and methods and finish draft of combiner