Keep working on survey implementation...