Could use the new org factory method to avoid a lot of code...