Added the command prompt and some house keeping