Working State

Can revert to this if needed