Changing the structure of this a bit to be more executable samples
Going to fix tests more later