Feature/do some work

Test