Almost Done. Just need DB and minor formatting cleanup.