Updated with tweaked swift. A couple of bug fixes but more about finding my footing in Swift coding