More scaffolding, adding test stuff