Patch 1

hey Rob, please pull this and look for the TODO items for you? Thanks.