Architecture and stuff

by @chelsea

chelsea