This will work for now, but yes, that's a good call for later