Terrible commit. Updated everything. Added payments and more