Added the imports file and fixed stuff, fix main