Implemented new shrine

closes #9