Added stuff... a lot of stuff