Methods are now exactly how they should end up working