(WIP) Initial checkin of extension, seems to be working in most normal use cases however