Minor changes, started SRS class