reducing api further
moving stuff over