Image class refactored. Need new unit tests now.