Finished (?) the dev TODO