Work on consolidating core code.