MVP Viable.. ish
Merge pull request #13 from pmills88/Custom

MVP Viable.. ish