Got initial version working