v0.4.0

Changes Jon made before making more changes.