added to main.cpp and stuff