Added module, privatized methods. Deletion in progress.