More changes with help from porcelli. Getting closer to a working app!