Updated API, needs a tiny bit of work.