A solution I'm content with for now