yanked out some unnecessary stuff while I do a remake