Added Song class, no tests