Trying to properly architect this now.