Made changes to make things work huzzah