first pass of class order

a refactor were the tasks are set with calls to classes.  Nothing major,
just some pre work for later.