Improved contact chip (not totally happy yet)
Better contact chip pt 2
Bit of a refactor