all modes roughly working now .. v0.0.3