almost working?
close to release 1.0, removing commented out lines