Completed? forgot to update classes to include traits.... oops....