WIP: Make rest of rules to pass tests, yet without continuation support