Properly Merged Files

Merged Eliel's commit that broke everything so now it's beautiful. Have
a gravity-esk thing going on. Good good.