Finish design pass changes. Close #68