added lines, TODO: fix rotations and translations