Crushed some pngs. Refactored some code to no longer use