Continued with deletion requests and images, some updated to form and other (unrelated) classes
Merge origin/master