Add all sorts of currinda based stuff