Continue reworking userdata to be class-based