Refactor code a bit. More demo text! Almost done.