cleaning up going to build off of master now.