beginning to reorganize code.