code works, but we sort of broke some parts and they need to be fixed at some point