Merge
Initial bits of move code. Need to figure out how to ACTUALLY move window