HUGE update, v0.5.b