More class additions, script in progress..