Initial code drop - sceleton extention