moved ore to its own class
porting more code to 1.7