Initial prority work...need to fix some tests.