overhaul initial commit