Refactor..new approach.  Removed Text and Buffer projects.