functionally complete. doing some cleanup