Added some more code to get more of a the real flow of an app, lots of little Swift issues