Moving to code that will work so we can play with it