WIP:  Fixed Params passing and missing border container

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>