Cleaned up api. 
Reduced number of methods.