Initial, ugly, but working release