Version 0.9, close to finished