Working on some big changes for 0.9.2