Stripped api of code that will be replaced. Going to do a rewrite of it eventually.