Added main app, and started on unittesting