Major tweaks, combines k+l, may not work, expect more commits haha