moved classes and shit
added convenience methods
no plan where this is going