massive changes, works now. official 0.0.1