Moving around step 1.
Merge branch 'ui' of github.com:jkieffaber/wildfire into ui