Consolidated everything in to a library to fix the egregious repetition