Added some prototype cbs functions
And lots of todo's