added first half of my stuff