Added stuff. Needs fixing