expose things better.
Moving to cleaner exposition of API