Add initial stuff, couple of helpers, tests