Add support for optional streaming state
Remove pesky .DS_Store
Remove pesky .DS_Store