Initial core implementation complete