iAdded some work in progress stuff.