Added custom handle

Think I managed to miss actually committing the changes last time around.
This is what you get for coding on the bus! Committed now.