Work-in-progress

Initial work-in-progress commit.