in progress save. code cleanup fixes. uncompiled