I want to run some tests and finish with some clean-up before merging this into master, will ticket out remaining tasks soon