Copy initial stuff over from sep-logic-dev