Major update to 0.0.1 alpha