Another checkin
Code Cleanup, flipped card materials (again...)