Further, small modifications to the architecture. Last commit for the night.