Pulled from working System

Full error check complete, with no warnings.