Write up basic design, organize structure a little