sooo many changes, but coming together nicely