Reworking for a react style interface.