rest of comps and sys added to new system
work on migration to new system