Added functionality, but without the flash message.
Resolved merge conflicts