Added inputs, still unfinished