Added ability to add/remove live, refactored.