Step 1

- Updated everything