Added alot to improve passing around info and cart vis