COnverted to generic class structure
Updated API doc with done/todo info