WIP - Fix Uri Parameters
WIP - Rebuild