Cleaned up solution so it will build