Some small updates. This build is not functional yet but is being
improved currently.