GUI + modified headers to work with C++