#355 #357 done, committing directly to develop because my hubris knows no bounds