Moved rendering to trigger. resolves #7