Base Update

Without Ryan and extra tests (it will be later).