Big commit with did a lot of TODOs

changed windows names, and more