first commit of new overhaul