I feel like this is kludgey way to do this... I'll try to clean this up next pass, as well.