Added lots o' stuff