minor changes, working out splittable functionality design.