implemented a pretty basic app so far
fix merge