working on base moonstone code