v2

Made progress and made more general