Working issues (23/33)

Working issues