Version 1.1 - actually works now