WIP #82

Added Jovan's changes to the attachment module