Merged: old code into new
Dev. checkpoint.
Removed: duplicates
Merged: duplicated method definitions.