BROKEN: switching to object-based (sort of) commands