Beginning revamp for simplified API
Completed API cleanup