Removing argparse cruft
Fix variable typo
Move attachments in shelf into their own array to allow room for other metadata