Continued with images and forms (only commiting to ensure all devs are up-to-date, code is a mess!)