Melakhim Aleph ch.2 - Solomon's Enemies

David instructs Solomon to ensure that both Yoav and also Shimi Ben Gera die a bloody death.  Is David casting his unfinished business on Solomon?  We contend that David is in fact warning a young an untested Solomon that enemies are waiting, plotting his downfall after King David's death. He instructs him to "be strong and be a man" or else, he will soon find the throne taken from him.