err NOW it does. kinda. gotta refactor