Added more functionality, still issues with adding Customer object