Started work on supporting script classes