willz first commit
fixed merge conflicts
started making view