Implemented New Features, Rewrote Riddles