Final commit. Working app