starting to merge with my code
main finished