handleHolder finished!

Ready to merge with master!