Fixed a couple mistakes I made, also trying to get click-and-drag going but it's not finding the shape I'm clicking for some reason :(