Added rest of EECE555 work