Adding changes to portfolio and Trump

separating out socket and non socket funcitonalities