Finished dev for v0.8