Not sure how difficult this will be, or if it is even possible with the current approach.... need further investigation