Started work on simpler API