first pass at adding stuff from the post-compo branch