Update some stuff and add base for status command