works now, still work to do though