more in-progress dev