Challenge image field and updated form (Still need to write tests/documentation)

Todo: Write test, don't pull just yet