Renamed file to match class; added members and constructor