Now fully functional (v1.0)