Dynam-ite

@sirodoht review and merge to `next` branch. Not complete but 90% there...