Closes #263 #251 #262