Improved sandbox and made code more OCDed