slowly cleaning up this mess