still cleaning up so that I can merge