Fixed the damn bug!
about to break things
Works