removing and adding working code. well. sorta.