Committing the work I did here, but it's not going to be used.