Author: Jonathan Bradley
Date: 2009-07-22 23:28:14 -0400
removed plugin and put calls in component, to simplify everything
