not done yeat but getting there