Made a good start on inputs