Some Changes To The New System

Still nonfunctional - To Fix Next Time