Initial revision, still very messy.