Untested Changes

Maybe stuff work now