No longer dependant on the hooks class