Unit checking almost working