Added work on converting to hooks