Revert back to boilerplate code
Move onto a more robust boilerplate code