Mostly done. Lmk if I need to do anything else