it actually works now.. probably final commit