Added more status puts, finally fixed odd race condition. Added TODO