Added some more code. Not yet working

Complete this!.