Finish up few thing in Cli + Work on Database && Config