Update

95% functionality done