reorganization
not sure how i missed this, but it failed
temporarily renaming reassigned constant because it is annoying me