more logic reworking

I swear I’ll get it figured out the way I want it