Update

Everything is functional now