Added some bits - currently commented-out as stuff's not working properly here.