WIP: (Re)Adding code for the basic system.

Still far from complete, but at least it compiles again.