started on preplan page
merge conflicts