almost there, Wak is loading components twice, causing problems...