end of day commit- some errors but important point of app