More rebuilding the debug menu WIP