adding files
Added proper file serving
merged from Bayards latest