Working on getting things moved out of here