Primitive fix for issue regarding missing C++ initargs
Fix and refactor to make menu options work and also be extensible.