Added supporting files for dev server
Misc RnD
Merge