Working on combiner. Old version somewhat broken version in middleware
as well
Missing files from last commit
Everything so far