sean was right, so revert the revert and repull all the old shit we dont need