move a lot of stuff around
restructuring and adding info