Completed with XC kinda working
Merge branch 'master' of https://github.com/Synz0331/CSCI3753