My commit
Add functions, modified view in accordind to plan