Lots of changes. Still kinks to iron out.