Still waiting on CI, gotta to to sleep, will merge first thing in the morning, please hold off on merging until then.