Version 2.0 halfway done