Almost there, 20 more tomorrow and I should have it!