Done #66, dev dynamic extends