Initial Build
Minor Adjustments