Tidied up a little bit
Some challenge placeholders added