Updated all hooks and filters. Getting ready for a cleaner redux