More work. Also started to work on new feature