Another day of work

- Too tired for a good commit message.
- Need to fix some stuff in the complete()