Just commit long standing changes

This whole repo is pretty much deprecated. Waiting for cleanup.