Some nasty prelim work
Some more stuff