Removed testing servo, switched to blocks