moved error
check before adding, rename function
import cleanup
testing wip