Fix Subject Ordering & Add to Todo