Implementing items and various edits to lib classes