Working to new keyword approach.
Updated a lot of changes to use kwforces.