Feature/do some work