Major update to 0.1