Feature/mammothbane/local async