Cleanup work and continued implementation