added methods
Added more methods, others need improving