approaching the final commits...hopefully