Update to Current

Updated all changes and added submit