Blocked

Clean up from TR evening.