Modified Item constructor to only use two parameters. Tests and sub-classes refactored.
Merge conflict resolved.