Build: #12 | Made some small changes, nearing completion of 0.7