initial commit #2341, should work now

Looking better