Beginning to fix shit