category feature added, needs more thought though