Extracted out Unit class; added shadows