Started to fix a few things before getting interrupted again