ported over all the things to the proper spot