Start working on generic components, add systems view