Added New Stuff. Still Rigid I think.