Moved some methods and added ignore
Merge