Feature/test2

Added features to develop