first run, definitely improving this

Mod note: time edited due to late final split.