This isn't hooked up yet, but all necessary structures and fields have been added so that selected pieces can be tested.