I can get rid of this with some minor changes as well.