done, 2 issues left: alignment and 0