Feature 1

Hey @maksenova can you review this.
See #2