Commiting so I don't lose changes, still slighlty buggy on the ordering but other changes have been implemented in ui and dont want to lose them