Survey Done

Still need to do testing