Some API-fication.. not there yet.