API overhaul

Commented out?