This is the same Code lol, but I commited it finally without conflict
FINALLY! looking good, starting to get this git hub stuffs