Controller Update

Works with minor errors now (nothing too noticeable)