Moved include statements to cpp file
Added more functions