Fixed the java view from the errors caused by the previous commit
Initial work on parsing the system-level stuff into the model