Attempting to move some of the wx stuff about