Work on new sunmoon code