Optimize alignment check
Begin implementing WL2, partially passes tests