More code, needs testing and completeing from home tonight.