just one more refactor pass and i will stop i swear