Working issues (18/33)

Working issues