added a shit ton of stuff