Start trab2, resolve issues

Closes #1
Closes #2