Issues #2-#49