Have final working version now!