Cleaned up TODO's that were todone
Fixed #25.  Now if only the RS API supported it