First draft of SampleCategory refactor