Organization lizard progress

Fixes: #2 #3