0.1.7 Staging [DO NOT MERGE]

This will be updated when I come back from dinner.