Lets rework that a bit before I leave it running