Starting to work through doxygen generated stuff