Pretty much done for now! Suggestions welcome.