Be consistent about using properties
Start pulling out analysis code
Closes #118