Made progress.... zzzzz