We should really be tracking stuff... this needs to be configurable