[WiP] Module updates and es6

(currently borked)