snapshot - started working on #18