Pull request: Initial work

@ccloes-intuit   can you please review this