ticket:1 wrote tests, they fail now
ticket:1 implementation + fixed some errors
ticket:1 Merge branch 't1_main_activity'