Work continues on Guard class