Made some changes to the main file.

GetByName is working now.