WIP: Remove jQuery dependency