Complete overhaul
Merge pull request #1 from fingerco/overHaul

Complete overhaul