Better models; almost completed #6
Closed #6
Closed #24