More redesigning.
MOAR CONVERSION