Almost done with #38.
Fixes #38
Fixed conflict
really fixed conflicts...