Add more level logic and simple CLI