more updates (almost done with basic architecture!)