Add octupus, change a safer implementation of singelton