Added all Goals functionality
merged files