second commit: adding rest of app