added a ton of stuff