Expose some methods and split some stuff up