merge page controller
initial work on mr. wizard
Merge pages controller
merge other work
stub artist name field