Changed a few bits to feature my name as a test