trying to re-build everything