Update Code and Add Stuff