hopefully almost done though?