jesse is reviewing this and we discussed where this could be problematic and this is tidier than what we currently have