Model made more generic and flexible, should better fit the application. Added cross workspace test compliancy. Started the creation of the json creator for graph drawing. Still in progress