WIP being really careful to always return when there's a error