No longer dependant on the Hooks Class