basic app working. Start taking care of edge cases