#17 Partial
#446 API: Change foreach to while at listings