Added operating systems stuff,  properly this time