I think I have a cleaner solution for this now.