Made the script a little more OO to prepare for testing