Add initial stuff plus tests and related data