cleaned up. jasmine not yet working