stone and mouse objects up + some refactoring