Comment some code out while I think of a better solution...