[#50929107] getting closer, still have some issues to resolve