Wilson camera refactor rebased