Added some initial work.