Throwing more code at the wall...