Reimplemented Mike's Challenges

fixes #36 and fixes #35