Extended basic impl, still WIP