Starting to convert the guts in to the package
tweak to set up and then run