While and For now generate; added helper class to wrap Commands