Quite a few changes. Moving towards being a runnable app.