final commit on this approach for now