Cup type and orientation basically working but a bit buggy