Made first steps towards multi system capability. DOES NOT RUN YET