Op funker ok
Moved some methods