Re-did all of the tests and image reading to minimize memory impact and function call simplicity