junk commit about moving things around, changing names, and adding module implimentations