committing to hope this will merge, I have no idea what I'm doing