mostly works now