Changing stuff to work with a Context Design Pattern