Core functionality already (roughly) tested, keeping on