Mock system generation edited.  Needs to be merged with laptop version... uh oh.