curri - mostly done

Looks alright...ish.