added base for Josh JMF code
did a terrible thing
did even more terrible things
Merge remote-tracking branch 'origin/dev-dan'