Added bunches of stuff