Aaron's update

All methods currently work fine with the exception of cone.