Reorganizing

More testing for how this works