Added so much stuff, it's hard to get into the details

mostly just got the thing to a pseudo-functiong point...