UPDATE - changes in model, view and almost everything... organic
development :)
UPDATE - another refactor