lots of changes...architecture still in flux, but is solidifying