90% done, just validation left