Finally able to look at WP8 implementation

Fixed namespace issues and general cleanup

Updated submodule