Update

added pretty much everything