properly import and build stuff
added stuff