Update basics

WIP, not ready to be merged.