Rework/squirrel

Is it Ready @jcmontoute ?