Milestone 5 complete

Milestone 5
Theme: refactoring
Refactor items to have abstract parent