works! time to ship for testing, and add settings