some changes made, getting closer to working