Major overhaul. Started anew after long time.