Cleaned up the project Also added another component