Restructured to use scalastic