A two dimensional bulk and quantum well laser simulation tool, based on the Bell Laboratories electron device simulator PADRE, has been developed. PADRE contains a suite of robust programs for obtaining self-consistent solutions of the Drift Diffusion equations. To this suite has been added programs for calculating the optical intensity inside the laser, the capture and emission rates between bound and free carriers, the interaction between the confined carriers and the optical field, and a set of new, powerful schemes for obtaining rapid convergence of the non-linear equations of the model. This paper describes the augmented program in its present form, gives examples of its present abilities and limitations, and discusses some illustrative results to show features of the simulation tool.