99% done, just need to time tests so they complete after asset compilation