finished lots of things, messy commits ending NOW