ugly in progress check in of script and new api namespace