Prep work for v0.1 demo

This is in addition to what qingtao has done.
Connected up Logic to Storage, refactored storage to use new getters and
setters, some touchups here and there.