More progress. Finished second bucket allocation. (Theoretically?)