Lots of basic mods. Should prepare for redatastructuring.