New API!

Committed for the new API.. Still not fully for 1.8