Final addtions

Whee FINISHED GUYS