Completed Assignment

Some of the test aren't passing, but I gotta get back to my day job.  App works, though.