second commit - refactor application to new design