Feature/6 batched handler

:+1: Thanks @pkatseas