More code to the keyword stuff and added some new rest calls