Second commit, same stuff as last commit, just visual studio didn't include some of these files