Cool, yep, I'll take this the next step and do some renaming and separation (separately from this PR)