merged most files, main.cpp and init.h still need to be merged