Really should have been it's own thing in the first place