Initial convert over to prototype