Finished, needs small details