Mainly updated API shizzle and TODO.