Moved init functionallity to the client