Added a SupressWarnings() for quicker commiting
Added LoadingState
Clean up