First stage of separate categories now implemented